Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 21 Dec 2011 10:00:10 +0000 (02:00 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 21 Dec 2011 10:00:10 +0000 (02:00 -0800)

Trivial merge